cleanup the code a little, remove some stuff that isnt used