removed deprecated field and adjusted command line switch
removed even more FundBugs bugs