Removed no longer needed dimensional fields from p struct
Merge branch 'p_cleanup'