Fix: remove unused params, tidy up method call for filling out forms