Cleaned up old method