Removed more debug stuff