cleanup and fix xrick