Remove almost deprecated arguments [closes #16, #17]