remove unused code
put test for margrabe option and delete output