Removed files that were accidently added due to merging