build-in c-pad selector cleaned up