removed junk in atomhandling