Remove wholly unnecessary functionality