Removed unused methods
Removed unused using directives
Merge pull request #540 from KindDragon/code-cleanup

Code cleanup