Core project cleanup