Removed some unused functions. Did a little renaming