removing excess code

remove the code that was added after merging the files