cleaned up sqlalchemy improvements after rebase

Change-Id: Ifee02de09ee6d50f90d8c10396d0c56a852c4829