Remove depricated code moving towards final 1.0 atom api

Doing some cleanup to remove usage of deprecated atom apis