Updated latest changes, removed DB