Fixing 1.0

Cleaning old things up which did not workout