Removed extra files from a fucke up merge