Defer some initialization until it's needed, remove unused method