Refactoring + cleaning + no Website + other deletions