clean up source a bit
clean up plugin loader