Removed some unused functions
Merge conflict