Removed some props