Code cleanup, remove old components.js