Code cleanup in basenode