2014-9-18 00:59:32 Cleanup and merging