Clean up used code :grinning: