cleanup and got it working again