remove using wrappers, fix #13, fix #14