cleaned up old override logic

tidied up some old override logic