Cleanup of bulls mess

Tags