removed uncessary case in service