Finished cleaning up, among other things