Cleanup

Doesn't appear to be any need to keep it like this now.