cleanup in code and in interface