Remove deprecated config locations

Thoughts on testing this...?