removed obsolete elements

Just for now. You will add anything you want tomorrow :)