more cleanup from poole