b3eaea3 Cleanup