one or two more commits and all unnecessary files should be gone