General code cleanup
Merge branch 'station3'
Reverted robot check