removed comments, unused code.