Cleaned up old code.