Commented out and deleted un used lines
Added Robotium tests
Adjusted some code handle the removal of deprecated code