removed unnecessary functions and tables