added alert icon, cleanup unused code