review code, remove crap