Removed references to support library