Cleanup, need for a fresh start allready..

I am in the learning fase.. bare with me. Re creating the thing to learn
it well.