Changes after group meeting, cleaning up and removing any files not bein...

...g used.