Fix #33 remove deprecated functionality