Version 0.2: removed unused code