Removed some unused functions (#12)