[#21] Remove other unneeded overrides