added rm and clear support