Clean up and track more stuff