cleanup
greatly simplify image loader