i think i removed all the clutter
new stuff