Eliminated unnecessary views