Removed unused pieces of code; fixes #8