Cleanup
Speed improvements (server only needs to import once)