removed some code

To be added at later stage.