Remove unnecessary unit functions