Remove unused files. Fix som bugs. Work in progress, not done yet.