Cleanup #185