Removed unused imports and unused db code
Adding subscription update on start