Update readme and cleanup