Drop old API
Cleanup some changes