cleaning up state methods, logs