Some more require js cleanup