removed the code fragments that were just needed as workaround for #2