#321 - Cleanup