added RobotMap. ID'ed TODOs. Cleaned up unused identifiers