Remove preloading functionality and clean up

- Closes #6