Fix #23
remove unused commented code