Doing some housekeeping

Deleting unneeded files, cleaning up others