Removed console log and debug messages