remove code from a former failed rebase
conform to toilet-paper format