Maintenance

* Cleaning the manifest files
* Update to API 21