Clean up imports and new js lib files