removed stuff which is currently used in another branch only