Clear all [Obsolete] for a fresh slate (#1378) * Clear a bunch of [Obsolete] stuff * Remove obsolete template element override