Code cleanup, 1.5.0 release