removed some stuff that shouldn't be in last commit