Deletion of some earlier stuff not used in the end