removed useless returns