Various cleanup part 2