Removed unused code
Removed deprecated objects