Removed alert-statements and added some comments
Merge branch 'remove-dead-code'