Merge old dev-snazz and forget that new stuff