clean up pools
remove unused vars; switch junit version