Final cleanup prior to starting to work on effects