Removed left over lib includes that aren't being used anymore