[General] removing old, irritating code