Remove unneccessary view logic