Remove duplicate 'return true' statements