Removed more debug statements