Cleanup of X and y