Fixed messed up merge
Removing old files