remove unecessary complexity