removed a few old comments and redundant lines