deleted some commented out nonsense