Remove unnecessary return true and false