Unnecessary code cleanup