Cleanup StateMaybe files and references