Updated readme and removed some obsolete/dead/testing-code.