Removed DB usage