Sourcecode comments and removing unused functions