Some cleanup - forgot to remove not working code