Remove functions we don't need anymore, fixes #83