removing some stuff that was hardcoded and didnt belong