- removed unsafe properties