Refactoring website + remove called