Finished academic year cleanup