Removed som db calls, but needs to be removed completly