Remove unneccesary tap & package