Cleaned up the remnants.