Removed things we won't be using.
Done some changes to integrate better using API and improved clear a bit for some cases.