Fixed activity creator and delete