remove console log and todo