removed misc stuff