source cleanup & improve keys deleting after pause