Random cleanup changes