Cleaning the code for now unused functions