Removed unnecessary functions, variable declarations