Removed some temporary changes for testing.