Cleanup duplicative view logic