consolidating stuff and removing convertP.c which is no longer needed