More housecleaning for Siggy!

More housecleaning for Siggy!