Castroville cleanup