ticket:5 files cleanup