cleaning up

cleaning up the old files to be neater and contain less vestigial code.