cleaning unnecessary parts of code