chg: removed un-used functions, added correct super() implementation