Remove static object initialization