Eliminated unnecessary dependencies on tableMaker