Addiontal clean up