Eliminated some unused classes