[CHANGE] some cleanup;