Removed unused code and sort the api versions