cleanup;
relates to #354