removed some nonsense code