Cleanup for new beta build