removing unused stuffs + several comments