cleanup affix code
cleanup title code