Removing unnecessary non-functional code