Prim Alterations

Removing unused code and changing function names to be uniform