Cleaned up leagacy views