Cleanup deprecated and fixes docs