Codebase cleanup. Removed unused/unneccessary includes, macros, variables and deprecated functions.