kicked stuff which is not needed
Merge pull request #523 from ffrensch/master

kicked stuff which is not needed