Removed Duplication that was copied from parent class