Remove superfluous methods, fix #6.