Latest code

Code has been Commented
Unused classes were removed