Remove all the mess i have created

Better to start from scratch.