moved unnecessary overrides used during testing