added namespace
fixed bug: remove expired files