Cleanup for 1.5 devel
Cleanup before v1.5 devel