Removed some unused variables and includes.