Removed a few unnecessary functions