Continuing to clean everything up