Cleanup and prepare for renaming