cleanup

@kentquirk can you have a quick check of this - thanks