tidying up master

removed elements that are being worked on in dev branch