Removed support library dependency