CON-21 | MTb Code clean up after creating Form builder