Mock data code cleanup