Clean up of @hellboy2k8 last commit