Clean up a bit in startup.js