Cleanup of SDK preferences and build.username.properties behavior