moved removability
cleanup