loading: removed a lot of cruft