Remove embed, add headers and also remove unused files