Use database column aliasing code

Remove unused variable

Change-Id: I76d3f09f2532889666b5c73b377a5d9f19b0b7aa