Remove unused includes and variables