#392 Clean-up