Update doc strings, got rid of unused code