#21 final cleanup