make forms utility and misc cleanup