cleared comments, deleted unuseful tests