Manually removed some more files (see last commit)