Fix extra fields <div> around container form and remove debug puts