Clean up drastically