Removed old debugging comments and checks