Cleanup

Stop copying stuff -.-