Removed unused variables and created in-class files.
Removed more unused variables.