Cleaned up deprecated variables.