Removing hopefully last occurence of action codes
Fixing #655