removed unessesarry stuff