Removed some more code to fix 64bit builds