Loads more cleanup. Loads more. Phew