Remove unused and poorly implemented things