Fixed some DB interactions and removed extra logging