A bit of code cleanup and deleting unecessary files