Some refactoring

Removed unused code comments;
Due to some backend limitations, i can't do buffering indicator. Sorry
:(