Cleanup phase 4

Removed one more redundant function