hack refactor
Removing views