Minor startup optimization and cleanup