Additonal cleanups