feature-15: Cleanup