Cleaned up startup and persistence handling