code cleanup/ remove console