refactoring, remove now.js