Cleanups to last section