Removed unneccessary library references to reduce footprint