cleanup for CC 2014