Add emptyView support.

Cleanup unused variables.