remove various unneeded affwp functions