cleanup
remove unused code and inaccurate comment
cleanup
get the tests to work; add loader tests