Initial release clean up