Clean up and fix seed