finally removed all left-overs