Remove test code
Add the loading code too