minor cleanup,removed gapps