Removed comments/debug statements