Cleanup

Cleaning up the code before moving it over to the RPI Mobile
organization