remove unused code

fixes #23 
fixes #24