small core cleanup (preparing to remove future.js)