Removing unnecessary functions