Remove the NEXT keyword and some custom agenda commands.