Cleanup part 2 - osunick