Added Dummy-Data and removed unused classes