Some steps to improve performance regarding issue #57
Closes #59
Cleaned dead code