Cleaning

Took out some unused variables, cleaned up some misc. stuff.