getting rid of db cookies
getting branches together for consistency.