removed 3rd party stuff