code clean + adding function remove + phpunit test