removed third party stuff