removed misc lint problems