Simplification of criminal procedure legislation