Removed db dependance