Remove 'cheat' functions that do absolutely nothing
Run astyle