Removed overhead parse calls
Removed overhead parse calls