[Fpm] Cleanup