More cleanup (removed debug msgs)