Removed some testing code which isnt relevant for this branch