Cleanup unrelated code