Clean up of svd routines