Remove declaration logic from util module