Removed unnecessary logs and codes