Remove unnecessary clutter
Remove Log, time measurement, and all kinds of useless details
Remove invalid statements. Streamline Tests

Remove all references to classes which were deleted. Tests pass now
Adjust views.
Minor changes (Clean up clutter, tweak references)