I can do that tomorrow, original PR approach was different and I didn't really pay attention to cleanup after..