[samjsharpe] Remove calibre and nvalt