Major clean up, remove dynamic loading