Removed DB Calls