removing some stuff that isnt needed anymore (why is this working actually)