cleanup and revert to old master views