removed unnecessary conditional statements, removed some old debugging code