minor code cleanup

some unused variables / imports cleaned up.