merge to close #206
removing file which should not have been included in merge