Fixed up a few minor issues. Every feature has been stripped and all old API's have been removed.