cleanup + leave option of keeping existing non-optimized version since the optimized version should return an error

Signed-off-by: Callum Styan <[email protected]>

Author: cstyan