Removed unused code and updated docs., see #4