Removed un-neccesities