Clean up usemace fn
More simplification