Cleaned up schemes.