Removed DB references