cleaning up according to remarks