pproperly removed stuff