Added comments. Removed depreciated code
Removed depreciated code