Greg/prerelease cleanup