Remove logic from view