Code Refinement

Removed unused code and methods, classes..