Removed stuff already ported to notebooks