Eliminated some extras