Don't load support files, reintroduce when there are any
Code style tweaks
Remove comment
Don't remove silencers, more style tweaks