Cleanup. Enhanced the filler process to try not to duplicate