Remove half-done future features code