remove shortcuts, log in case of critical exception, fix bug to bail out in case of error
remove postfix