Removed Some Wierd Code Caused by Merge

Need to get my head round merging and conflicts!