Pruning

Removed some redundant functions