small cleanup

removed unused code, changed title and headline
Merge remote-tracking branch 'origin/master'