fixes #2411 refactor config/initializers
fixes #2440 remove unused code and files