Performing cleanup of dead/unused code
Cleanup continued