Removed old Code and renamed state_manager