(COMMIT-14) Removed Spring configuration