Removed unused functions (Part 2)