removed some alerts and comments