Removed support library dependancy completley