Remove third-party
DRY