Code cleanup in core