remove crap
code cleanup