cleaned up old organization