Removed useless business logic