Cleanup for first release