cleanup (already in msm7x27-common)