Removes some public methods, fixes setup task.