Removed unimplemented (henceforth new features in dev-* branches)