Removed unnecessary alerts
Merge commit: latest bug fixes