review code, get rid of commented leftovers