Removed unused variables and rant