remove junk
fix logical error (commented out)