removed silly things - ready for migration