Some cleanup and removed an alert