removed the where nonsense