Removed dead code
Updated to latest form-factory