- removed workarounds and deprecated API usage