Updated note about non-stabilized API
Cleaned up some dead code