Removed useless returns