removing non-functional code