Remove check for compatibility mode
Remove unnecessary return statement