#554 - Remove some dirty