Removing functions that are now in atomic library. Updating function calls.