removed most of dynamic calls