Cleanup and nearing final commit for 1.5