removing some complex code which isnt required any more