Removed quick function calls

Removed quick function calls to direct in $