Remove redundant code
Fix #23