cleaned up unnecessary views and methods