remove some of the old approach Fixed #76 again

Finished 398