finish up the dynamic loading, clean up unused/commented code