removed duplicate state tracker code from modekl