Removed router and db config