Removed Old State Manager