Cleaning up old stuff and issue #27 can be closed