Removed console log/trace calls