Misc additional cleanup