Remove varioud deprecated functionality