remove noddy derv code