Removed some Delphi compatibility