Revving to 0.6, fixing remove and deactivate not naming namespace