Clean up in unused scripts and commenting