Code cleanup for Alpha 1.1.2